Move generator to helper class