Updated generators