Modified API interface