Up-to-date with recurrence package
Stable JSON marshalling