Added functionalities that I want to implement