Added data class with