Update for 1.11