Added template and outlined unit names