Updating classes to match new tome system.