Fixed the format and add column type