Add enum for Surface type and format