Allow unit name to be provided via cli