IPCE and Intradijkstra classes are modified