Changed the way the ClassBuilder functions.