Update for sf 2.3