Change argument format; support strings as data;