Add support for timestamps
Fix the type field