Some changes for AP and DHCP