Refactoring ACL

Change-Id: I934437b2375df70ef0283e533919bf0717ff6e05