Refactor uniqueness check on Device