Changed interface of export