Update a few class and add 2 new base class.