Add and use dedicated attribute definition collection.
Improve library.