Adds support for timestamps and enums