Added some functionalities