Implemented new generators