Changes for PShape reference