* API: major refactoring