Added multiple mappings per device