Refactoring of accommodation