Updated p2 repo with new features