Added support for Access Points.