Refine ACL support