Improve font importing