Reinstated the ability to use reference types within models, and choose them with edit/create handlers.