Changed parameters to UnitIdentifier, to make things easier for
networking