Implementing more APIs
Adding implementation