Refactoring data structures in order to support models with boundaries.