WCore refactoring