Updates to have the generator filter