Added basic shapes.