Added timestamp parsing