Some export modifs