Made coordinator smarter