Improve rigging classes