Updated APN handling