Added heartbeat prototype
Fixed endpoint looking up local registry always