Removed dict of string data args and replaced with anon objects