Finish refactoring the Acl component