Further API simplification