Clarified API