More work to the init template