Adding some more functionalities