Updated zp loader