Changes to acl and user modules