New feature: Export safety