AssignParser improvement