continued adapting data class