Add circle and bar handling.