FIX: Update use of deprecated methods