Added Additional Functionality and various other classes