Added simple_enum and view tweaks