#1107 Adding ids to org and member wrappers