Adding more functionalities