Updated mappings for fix 404