Added the support for user-inserted apns