Added Shapes and SingleVaribleFunction