Improve New modal & supports arguments and files