Adding enhancements for #1 - Enabling multiple app restart