Changes according to latest refactoring in JPC