Added parameter to include devicenames