Remove Param and allow specification of kwargs name