Changed devices list to more efficient data structure