Added functionalities