Updated for dynamic font support