Refactored column definitions so that repetitive code is auto-generated