Changed to new type generation.