API simplification and extension