make it sf1.x totally independent please so we can adapt this bundle for a more generic usage