Rounded out shape classes