Refactor restart flag
Refactored restart flag
Handle configure requests