Implemented the last API functions