Moved export path
More modifications