Added Valid from/to fields