New syntax refactoring is working