Refactoring for hue support