Change bundle name and add checking for missing values