Port access control to new framework

Squashed/Flaked version of #583