Updating to be aware of static export