More 1.0 API review