TR: Update to handle grandparent classes, increment version