Revising structure for more language variations