Bunch of functionality added