Add powerTip type, refactor of code