Made changes to the classes