Refactor, use Value rather than RlpValue