eliminated some querying overhead when populating device map