Commit #9: extension to the infrastructure with more devices + minor changes in extra...