Add ability to read correct timestamp