Various functionalities added