Rebuilt with the new refactoring