added tags for shapes