UPGRADE: Move to non deprecated extension call