API is now more concise