#19 add TimestampsToReturn in sample