Add optimize waiting