Added new ACL handling