changes for sf 2.3 support