Functionalities updated