Add shutdown manager and timer