Remove hardcoded bundle identifier and instead lookup bundle via class