[Mod] Need more changes in APNs