added new data classes with getters and setters