Changed expiry date to 0 on packages with no duration
Changed splitter for purchase / callbacks to be -hyphen for compat with sage