Added more font support