Changed to make compatible with changes to swift-recon