Rib support refactoring II