Changed loading of properties files.