Add enum support