Fixed another problem with references collection. Finished users collection.
Merge origin/master