Updated PCL calls and structure to work with the standalone PCL used in Hydro