Fleshed out the data class