Latest changes that take into account of the new ESB changes;