Updated Property system