Updates for multi-dashboard support