Adapted latest cyvasse-common