Rewrite part of snapshot feature to get connections correctly