Update only_if to have configurable wait interval