Added support for non scalar values