Fixed API so that we just send IDs in events, not full objects