Added basic shape classes.