Better handling of arguments