diff --git a/VizhTalk.Gateway.BFF/Queries/Query.cs b/VizhTalk.Gateway.BFF/Queries/Query.cs
index 0044454..b726cf8 100644
--- a/VizhTalk.Gateway.BFF/Queries/Query.cs
+++ b/VizhTalk.Gateway.BFF/Queries/Query.cs
@@ -1,14 +1,30 @@
-using VizhTalk.Grpc.Learning.Language;
+using VizhTalk.Grpc.Learning.Course;
+using VizhTalk.Grpc.Learning.Language;
 
 namespace VizhTalk.Gateway.Web.BFF.Queries;
 
-public class Query(LanguageGrpc.LanguageGrpcClient client)
+public class Query(
+    LanguageGrpc.LanguageGrpcClient languageClient,
+    CourseGrpc.CourseGrpcClient courseClient
+)
 {
     [GraphQLName("Languages")]
     public async Task<GetAllLanguageDTO> GetAllLanguage(GetAllLanguageQuery request)
-        => await client.GetAllAsync(request);
+        => await languageClient.GetAllAsync(request);
 
     [GraphQLName("LanguageByTitle")]
     public async Task<LanguageDTO> GetLanguageByTitle(GetLanguageByTitleQuery request)
-        => await client.GetByTitleAsync(request);
-}
+        => await languageClient.GetByTitleAsync(request);
+
+    [GraphQLName("Courses")]
+    public async Task<GetAllCourseDTO> GetAllCourses(GetAllCourseQuery request)
+        => await courseClient.GetAllAsync(request);
+
+    [GraphQLName("CourseByTitle")]
+    public async Task<CourseDTO> GetCourseByTitle(GetCoursesByTitleQuery request)
+        => await courseClient.GetByTitleAsync(request);
+    
+    [GraphQLName("CourseByCourseId")]
+    public async Task<CourseDTO> GetCourseById(GetCourseByIdQuery request)
+        => await courseClient.GetByIdAsync(request);
+}
\ No newline at end of file