Optimize wait service