Adding intelligence to devices index