Re Design ClassBuilder