Add support for namespaced models