Replaced ObjectFactory classes.