Added name and modified enums to support values