Added funtionalities