Add support for Block/Unblock and Restart after shutdown