Last changes for functionalities