Refactor ACL methods