Added a data class