Synchronized with refactoring