[master] Attempt at encoding lists and dicts