Add support for models that are contained by modules