PLFM-2039, PLFM-2040 ACL Refactoring