Aviary collector work: attribute retrieval; tool refactoring and support for same