Move from lists to dicts for queue items

Improves readability