Changes to support .proprties file implementation