Update to work with latest Councilmatic core code