added AbstractValueFactoryWrapper