Added Aruba support