[3.9] Add ACL & helper methods