Added working with p2 director