Replaced cel and dun helpers with single helper class