Changed helper class