Changes to the health handler