Work on refactoring the Acl functionality