Moved more fields out of the hooked scope and into the classes scope.