Added new shapes