Change export path and message return