Refactoring so only uniqueId is passed on heart beat