added support for values