Replace depreciated option