Added Fields for Enum-Support