[esb-dev] Code changes