Added some new shapes