Follow-up on review

Added a separate Avocet block per server