Switch to helper class