Doc and template improvement