Implemented more API