[TASK] more demmurage support