Column logic moved to outer enum