Moved suitable container search from Executor into Dispatcher