Updated dwp mappings with tools subdomain