Add possibility to choose shape.