Added rest of shape based annotations.