Improved animation and ClassFactory.