New functionalities added