improve monitor-support