Fix for #24; Type class now aware of Enum classes