Issue #47 : move routines to init hook system