Added detailed data class for parser