Added eager loading of users