Changed how the properties are loaded.