ShapeGenerator POC added