Added mapping and policy from Dominic/Maria