diff --git a/.rubocop.yml b/.rubocop.yml
index 5d320cd..0793e2c 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-performance
   - rubocop-rake
   - rubocop-rspec
diff --git a/lib/rocket_chat/messages/group.rb b/lib/rocket_chat/messages/group.rb
index 0b73dd8..77c99f0 100644
--- a/lib/rocket_chat/messages/group.rb
+++ b/lib/rocket_chat/messages/group.rb
@@ -48,10 +48,10 @@ def remove_leader(room_id: nil, name: nil, user_id: nil, username: nil)
       # @return [Room[]]
       # @raise [HTTPError, StatusError]
       #
-      def list(offset: nil, count: nil, sort: nil, fields: nil, query: nil)
+      def list(offset: nil, count: nil, sort: nil, fields: nil)
         response = session.request_json(
           '/api/v1/groups.list',
-          body: build_list_body(offset, count, sort, fields, query)
+          body: build_list_body(offset, count, sort, fields)
         )
 
         response['groups'].map { |hash| RocketChat::Room.new hash } if response['success']
diff --git a/lib/rocket_chat/messages/user.rb b/lib/rocket_chat/messages/user.rb
index 23075d9..1eac9ae 100644
--- a/lib/rocket_chat/messages/user.rb
+++ b/lib/rocket_chat/messages/user.rb
@@ -122,8 +122,7 @@ def list(offset: nil, count: nil, sort: nil, fields: nil, query: nil)
       def info(user_id: nil, username: nil, include_rooms: false)
         response = session.request_json(
           '/api/v1/users.info',
-          body: user_params(user_id, username)
-            .merge(include_rooms ? { fields: { userRooms: 1 }.to_json } : {}),
+          body: user_params(user_id, username).merge(include_rooms ? { includeUserRooms: true } : {}),
           upstreamed_errors: ['error-invalid-user']
         )
 
diff --git a/spec/rocket_chat/messages/user_spec.rb b/spec/rocket_chat/messages/user_spec.rb
index 5311beb..deaa87c 100644
--- a/spec/rocket_chat/messages/user_spec.rb
+++ b/spec/rocket_chat/messages/user_spec.rb
@@ -172,7 +172,7 @@
       stub_authed_request(:get, '/api/v1/users.info?username=some_user')
         .to_return(expected)
 
-      stub_authed_request(:get, '/api/v1/users.info?fields=%7B%22userRooms%22:1%7D&username=some_user')
+      stub_authed_request(:get, '/api/v1/users.info?includeUserRooms=true&username=some_user')
         .to_return(
           body: {
             success: true,