moved retrieving extra device info to separate file