Add app-id checking