#21 Add the ability to handle  a specific source timestamp on variable