moved generator loading to cli class