Added unitname and path.
MOre refactor