Improve methods to handle arguments.