Added support for multi values variables
Added more unit tests