Adaptation to crossdata-common 0.1.1 SNAPSHOT in order to pass unit tests