Made Changes to make only one device specific Identifier