Refactorings and preparations for columns groups support