FIX: PdoExt variable names, indices