Add support for agreement being required with version 7