Improved support for creating models [BETA]