Add proper backup handling