added support for timestamps and cursors
fixed support for cursors and timestamps