[WIP] Use Slot in Peers