Made Unit class less specific