Added topological domains, updates output format