Update Shape class

Include extra shapes