Add field for component IDs, normalize container field names.