Updated missing functionalities