Added NameGenerator and UpdateCursor