Refactored inline API to single methods to improve speed