to_dict on a few more entities