Improve adaptee collection usage