Added unit names and appropriate management of them.