Feature/heartbeat