Add support for objectgroups, shapes, etc.