Updated with new jpf.properties