Added demurrage and custom currency handling