diff --git a/src/Client.Helpers.cs b/src/Client.Helpers.cs
index 58d5d7b..7748d52 100644
--- a/src/Client.Helpers.cs
+++ b/src/Client.Helpers.cs
@@ -527,7 +527,7 @@ namespace WTelegram
 					foreach (var kvp in ccp.users) result.users[kvp.Key] = kvp.Value;
 					lock (participants)
 						foreach (var participant in ccp.participants)
-							if (user_ids.Add(participant.UserID))
+							if (user_ids.Add(participant.UserId))
 								participants.Add(participant);
 					offset += ccp.participants.Length;
 					if (offset >= ccp.count || ccp.participants.Length == 0) break;
diff --git a/src/TL.Extensions.cs b/src/TL.Extensions.cs
index 71dcdc6..3038d0e 100644
--- a/src/TL.Extensions.cs
+++ b/src/TL.Extensions.cs
@@ -13,9 +13,9 @@ namespace TL
 		private class CollectorPeer : Peer
 		{
 			public override long ID => 0;
-			internal Dictionary<long, User> _users;
-			internal Dictionary<long, ChatBase> _chats;
-			protected internal override IPeerInfo UserOrChat(Dictionary<long, User> users, Dictionary<long, ChatBase> chats)
+			internal IDictionary<long, User> _users;
+			internal IDictionary<long, ChatBase> _chats;
+			protected internal override IPeerInfo UserOrChat(IDictionary<long, User> users, IDictionary<long, ChatBase> chats)
 			{
 				lock (_users)
 					foreach (var user in users.Values)
@@ -34,7 +34,7 @@ namespace TL
 
 		/// <summary>Accumulate users/chats found in this structure in your dictionaries, ignoring <see href="https://core.telegram.org/api/min">Min constructors</see> when the full object is already stored</summary>
 		/// <param name="structure">The structure having a <c>users</c></param>
-		public static void CollectUsersChats(this IPeerResolver structure, Dictionary<long, User> users, Dictionary<long, ChatBase> chats)
+		public static void CollectUsersChats(this IPeerResolver structure, IDictionary<long, User> users, IDictionary<long, ChatBase> chats)
 			=>  structure.UserOrChat(new CollectorPeer { _users = users, _chats = chats });
 
 		public static Task<Messages_Chats> Messages_GetChats(this Client _) => throw new WTException("The method you're looking for is Messages_GetAllChats");
diff --git a/src/TL.Helpers.cs b/src/TL.Helpers.cs
index 1b7b952..a4bb8a3 100644
--- a/src/TL.Helpers.cs
+++ b/src/TL.Helpers.cs
@@ -118,25 +118,25 @@ namespace TL
 	partial class Peer
 	{
 		public abstract long ID { get; }
-		protected internal abstract IPeerInfo UserOrChat(Dictionary<long, User> users, Dictionary<long, ChatBase> chats);
+		protected internal abstract IPeerInfo UserOrChat(IDictionary<long, User> users, IDictionary<long, ChatBase> chats);
 	}
 	partial class PeerUser
 	{
 		public override string ToString() => "user " + user_id;
 		public override long ID => user_id;
-		protected internal override IPeerInfo UserOrChat(Dictionary<long, User> users, Dictionary<long, ChatBase> chats) => users.TryGetValue(user_id, out var user) ? user : null;
+		protected internal override IPeerInfo UserOrChat(IDictionary<long, User> users, IDictionary<long, ChatBase> chats) => users.TryGetValue(user_id, out var user) ? user : null;
 	}
 	partial class PeerChat
 	{
 		public override string ToString() => "chat " + chat_id;
 		public override long ID => chat_id;
-		protected internal override IPeerInfo UserOrChat(Dictionary<long, User> users, Dictionary<long, ChatBase> chats) => chats.TryGetValue(chat_id, out var chat) ? chat : null;
+		protected internal override IPeerInfo UserOrChat(IDictionary<long, User> users, IDictionary<long, ChatBase> chats) => chats.TryGetValue(chat_id, out var chat) ? chat : null;
 	}
 	partial class PeerChannel
 	{
 		public override string ToString() => "channel " + channel_id;
 		public override long ID => channel_id;
-		protected internal override IPeerInfo UserOrChat(Dictionary<long, User> users, Dictionary<long, ChatBase> chats) => chats.TryGetValue(channel_id, out var chat) ? chat : null;
+		protected internal override IPeerInfo UserOrChat(IDictionary<long, User> users, IDictionary<long, ChatBase> chats) => chats.TryGetValue(channel_id, out var chat) ? chat : null;
 	}
 
 	partial class UserBase : IPeerInfo
@@ -191,7 +191,7 @@ namespace TL
 		/// <summary>returns true if you're banned of any of these rights</summary>
 		public abstract bool IsBanned(ChatBannedRights.Flags flags = 0);
 		public abstract InputPeer ToInputPeer();
-		public static implicit operator InputPeer(ChatBase chat) => chat.ToInputPeer();
+		public static implicit operator InputPeer(ChatBase chat) => chat?.ToInputPeer();
 	}
 	partial class ChatEmpty
 	{
@@ -542,22 +542,22 @@ namespace TL
 	partial class ChannelParticipantBase
 	{
 		public virtual bool IsAdmin => false;
-		public abstract long UserID { get; }
+		public abstract long UserId { get; }
 	}
 	partial class ChannelParticipantCreator
 	{
 		public override bool IsAdmin => true;
-		public override long UserID => user_id;
+		public override long UserId => user_id;
 	}
 	partial class ChannelParticipantAdmin
 	{
 		public override bool IsAdmin => true;
-		public override long UserID => user_id;
+		public override long UserId => user_id;
 	}
-	partial class ChannelParticipant		{ public override long UserID => user_id; }
-	partial class ChannelParticipantSelf	{ public override long UserID => user_id; }
-	partial class ChannelParticipantBanned	{ public override long UserID => peer is PeerUser pu ? pu.user_id : 0; }
-	partial class ChannelParticipantLeft	{ public override long UserID => peer is PeerUser pu ? pu.user_id : 0; }
+	partial class ChannelParticipant		{ public override long UserId => user_id; }
+	partial class ChannelParticipantSelf	{ public override long UserId => user_id; }
+	partial class ChannelParticipantBanned	{ public override long UserId => peer is PeerUser pu ? pu.user_id : 0; }
+	partial class ChannelParticipantLeft	{ public override long UserId => peer is PeerUser pu ? pu.user_id : 0; }
 
 	partial class Messages_PeerDialogs { public IPeerInfo UserOrChat(DialogBase dialog) => dialog.Peer?.UserOrChat(users, chats); }