Added Types header.
Added time types.