Improved to support IL Harmor parsing