Simplify the API (breaking changes)