Syntax change after refactoring