Change the API to support empty arguments where allowed