Updated basic shapes