Added support to component export