Expanded data classes to be cloneable and added some additional getters
and setters.