Improved api usability