Added selection flag to shapes