A fix to template and making imports explicit.