Modifications to data indexing and work towards time based plotting