CFY-1761 added debug logs + use curly braces for string extrapulation