Added basic funtionality