Code cleanup
Store time

time was indexed but not stored before