Implemented critical apis