Updated time conversion and indexing