Further work on the view. Adjustments in the enumerations