Changes to the way subtypes are handled. Fix issue #11