Added some basic functionalities