added fields to data class