Added support for namespaced models, working on issue #18