Adjusted all the classes so they will compile without errors