Finish adding module related hooks