added id field to data class