Removed redundant code, ValueObjectFactory