I think we should keep old long signatures and  add `**kwargs` just for arguments not present in current argument list.