Latest changes that take ESB-restructure in to account.