Adds export support. bjmcmorran