Switched back to persistent ValueFactory