Assure right resolution of date
Make Type functions serializable