add support of sf 2.3