Moved columns to its own file