Refactoring to only send uniqueId on heart beat