Updated new functionalities