Improved api