Adding rest of the functionalities