Rework the ACL/Auth functionality