Merge "Move column definitions to an inner class"