add valid from and valid to conditions