Added more functionalities