Putting back some of the access control functionality that was removed