Refactored duplicate column definitions