adapted to changes of service descriptor in genesis