Resolve cabinet office 404 and new mappings