Updated project to refactoring on core