Stop specifying unit1 and dicts for it when there is only one unit