Implemented more of API