add join and heartbeat