Added variable substutution in .properties files