added date injection support