Refactor the Acl component