Add enum type support