Added support for mapping to namespaced data models