More functionality Implemented