Adapted to changed SP interface