Added data class to make things data driven later