Simplification of the API