Added parameter to control showing/hiding enumerations