Added support for new graphics, fixed export functionality.