Adapated latest cyvasse-common