Added support for avatar collectionName.
Added messageHolder and unit tests.