Update for 2.3 compatibility