Add improved monitor server