Version 2.1.1 - Added Enumeration type