Including new generators