Switch away from deprecated methods