Fixes to allow flexibility in type selection and still maintain
automatic attachment-mapping parsing