Adding support for custom value handler