Fixed timestamp parsing, refactored ProductType enum factory method