Thx for the input. I moved both uniqueID and software-id to separate methods.