Added some funtionalities