Add Shape class