Added fix for ttl in datastore