Use non-deprecated method