Fixed heartbeat, added auth stub