More API simplification