Add more basic shapes