Refactoring of framework entities