Re-added support & tests for custom cols