Updated extensions to use PXF v2.1.0
Cleaned up the code and made it adhere to the new API standards