Add logging and use the shorter form way to call modules.