Changes to support .properties file