Some further testing and added data classes into ObjectFactory.