Moving a few things into the separate class registry class.