Fix the dispatch method that calls the appropriate HA function based on HA Type