Adding support for Authorization Policy