Added additional replaceable fields in YAML config