Added HeartRate support