Added template and manager