Added device to annotation lookups