Add SFR resolver
Add SFR2
ok