Changes for APN