Updated to latest cyvasse-common, some refactoring