added fields on validity (from to)