Added Image and Glyph classes.