Support new generators in lib