[IMPROVEMENT] Add helper class