Sort out api, add bin