Adding acl policy and fixing dependencies