Added Glyph support