Added constructer with parameters for all shapes