Add Regex and Enum