CDB-1306 Added support for variable placeholders