Extra doc and simplify parameter