Add support for nested Model namespaces