Revert "Revert "dates management""

This reverts commit 3a09501ac5a9973b22dfe1bb037b62aa659edb79.