added heartbeat feature (to be continued... adapter/client-side)