Fix The build due to refactoring