Adding support for different value types