Updated API methods to new style