Add option not to add applicaiton_name