Replace long serialization with Dates
Optimise imports