Update to support PE3.x