Fine-tuning the new management tables