Added extra font support