Added additional exportables support.