Added some more functionalities