improve support for namespaced models