Confirm deprecation corrected