Make unit name optional for path units