Change property loading code accordingly