update loading propertycontract and add upgrader
merge upgrader