Add timestamp to indexing and sort