Added template system