Added template that can expand records