Moved the timestamp stuff out of the adapter