Added ligature support