Users collection: simplified code