Added some more shapes