Adding get_arguments method and bits of optimization