Corrected the unique identifier management to have separate unique identifiers for different types of objects.