Refactoring for external raet