Added requested functionalities