Made p2 dependencies optional