more data class changes