Upgrading ACL implementation