Adding in installation and handler for restarts