Adjust to make it easier to add app_name and salt