Added user objects for when users have more data and organized things around them better