improve monitor support