Adding ValueInterface support