Adapted to STANBOL-1356 changes