[TASK] Streamline creation of column maps