Issue #7 is solved. ObjectFactory is enhanced.