Policy: add a Map policy, use instead of Proxy

Policy: add a Map policy, use instead of Proxy #1452