Handle Enumeration values
closes #3