Refactored columns