Add Shape classes, use shape in Pixel Collider