Refactoring on Level and Entity