add support for dates
output should be equivalent (without extra set)