colocated mv refactoring