Maked changes to the initialization of the webapp