Improved Enum detection
First pass on Interface