Add support for variable replacements in properties