Feature/add rsf for v6