Improve HeartEntry somewhat