Added additional column types + time measurements