Updated config. will replace with sf bundle soon