Adapted to new version of connector-commons