Refactored users loop and added default null list for user events