Refactor connect.auto_split