Adaptation to new Rentgen API