Adjusted data classes so they are working properly.