Restored some classes that must be used.