Changing Shim to use the new Authorization framework in the RI