Application topology update and some improvements