Add hooks into main installation client; 3.1.8