Improve/fix support for nested Model namespaces