Fixes #15 - ObjectFactory