Helper class hierarchy changed!.