Refactored ACL matrix
0.22.0