Removed support for multi-value data as out of scope