Update tools for better export handling