Added a data class, changed data methods