Added software-id field to model and updated swidimport command