API changes to allow app-id and bundle-id support