Add details to heartbeat

Close issue #4