working with new changes in web_apps_common