Update default behaviour and doc