Improve health tracking