Implemented changes to the API