Updated with string split, need to handle keywords/build dicts