Feature/sf sync