Starting to improve atspi-collection