Updated functionalities