Adjusted to work with new PT Fieldpack v2.x