Changed from using CUSTOM_VIEW_FLAG macro to an enum value