Added more shapes