Updated to latest value-api