APN improvement