diff --git a/pom.xml b/pom.xml
index e3c914b8c50481e00def69206f602fdf6187ffaf..ad5011adebf767aa79b6645cb5d78ad47b931ec5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -192,11 +192,42 @@
 	</dependencies>
 
 	<build>
+		<!--Added by Jayendra for AdminAccounts Protobuf compilation-->
+		<extensions>
+			<extension>
+				<groupId>kr.motd.maven</groupId>
+				<artifactId>os-maven-plugin</artifactId>
+				<version>1.6.1</version>
+			</extension>
+		</extensions>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<!--Added by Jayendra for AdminAccounts Protobuf compilation-->
+			<plugin>
+				<groupId>org.xolstice.maven.plugins</groupId>
+				<artifactId>protobuf-maven-plugin</artifactId>
+				<version>0.6.1</version>
+				<configuration>
+					<protocArtifact>
+						com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
+					</protocArtifact>
+					<pluginId>grpc-java</pluginId>
+					<pluginArtifact>
+						io.grpc:protoc-gen-grpc-java:1.4.0:exe:${os.detected.classifier}
+					</pluginArtifact>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+							<goal>compile-custom</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/src/main/java/biz/nynja/account/repositories/admin/AccountRepository.java b/src/main/java/biz/nynja/account/repositories/admin/AccountRepository.java
index 4b7acf318a6cd620ae95ccc1f3363664a243cb13..09b1665d943f6cea40fd9f7ee778525281e295a5 100644
--- a/src/main/java/biz/nynja/account/repositories/admin/AccountRepository.java
+++ b/src/main/java/biz/nynja/account/repositories/admin/AccountRepository.java
@@ -5,7 +5,6 @@ import biz.nynja.account.models.Account;
 import com.datastax.driver.core.PagingState;
 import com.datastax.driver.core.Statement;
 import com.datastax.driver.core.querybuilder.QueryBuilder;
-import com.grpcServer.entity.Account;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/biz/nynja/account/services/AdminAccountsImpl.java b/src/main/java/biz/nynja/account/services/AdminAccountsImpl.java
index 4044eea104ce63fac33c9113bd8dbbb58cdcbbaa..8ef404dc09b4f495d535280de958ce3a7842a50d 100644
--- a/src/main/java/biz/nynja/account/services/AdminAccountsImpl.java
+++ b/src/main/java/biz/nynja/account/services/AdminAccountsImpl.java
@@ -3,12 +3,10 @@ package biz.nynja.account.services;
 
 import biz.nynja.account.models.Account;
 import biz.nynja.account.services.admin.AccountService;
-import biz.nynja.admin.account.grpc.AccountDetails;
-import biz.nynja.admin.account.grpc.AccountsList;
-import biz.nynja.admin.account.grpc.AccountsResponse;
+import biz.nynja.admin.account.grpc.*;
 import biz.nynja.admin.account.grpc.AdminAccountsServiceGrpc.AdminAccountsServiceImplBase;
-import biz.nynja.admin.account.grpc.ErrorResponse;
 import com.google.protobuf.ProtocolStringList;
+import io.grpc.stub.StreamObserver;
 import org.lognet.springboot.grpc.GRpcService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,8 +33,7 @@ public class AdminAccountsImpl extends AdminAccountsServiceImplBase {
     private static final Logger logger = LoggerFactory.getLogger(AdminAccountsImpl.class);
 
     @Override
-    public void searchByAccountId(biz.nynja.admin.account.grpc.SearchByAccountIdRequest request,
-                                  io.grpc.stub.StreamObserver<biz.nynja.admin.account.grpc.AccountsResponse> responseObserver) {
+    public void searchByAccountId(SearchByAccountIdRequest request, StreamObserver<AccountsResponse> responseObserver) {
 
         logger.info("Search Account By Account Id Endpoint.");
         logger.info("");
@@ -109,8 +106,8 @@ public class AdminAccountsImpl extends AdminAccountsServiceImplBase {
     }
 
     @Override
-    public void getAccountsByCreationTime(biz.nynja.admin.account.grpc.GetAccountsByCreationTime request,
-                                          io.grpc.stub.StreamObserver<biz.nynja.admin.account.grpc.AccountsResponse> responseObserver) {
+    public void getAccountsByCreationTime(GetAccountsByCreationTime request,
+                                          StreamObserver<AccountsResponse> responseObserver) {
 
         logger.info("");
         logger.info("Get accounts by creation time endpoint.");
@@ -257,8 +254,8 @@ public class AdminAccountsImpl extends AdminAccountsServiceImplBase {
     }
 
     @Override
-    public void getAccounts(biz.nynja.admin.account.grpc.GetAllAccountsRequest request,
-                            io.grpc.stub.StreamObserver<biz.nynja.admin.account.grpc.AccountsResponse> responseObserver) {
+    public void getAccounts(GetAllAccountsRequest request,
+                            StreamObserver<AccountsResponse> responseObserver) {
 
         logger.info("");
         logger.info("Get all accounts endpoint.");
@@ -408,8 +405,8 @@ public class AdminAccountsImpl extends AdminAccountsServiceImplBase {
 
 
     @Override
-    public void searchByUsername(biz.nynja.admin.account.grpc.SearchByUsernameRequest request,
-                                 io.grpc.stub.StreamObserver<biz.nynja.admin.account.grpc.AccountsResponse> responseObserver) {
+    public void searchByUsername(SearchByUsernameRequest request,
+                                 StreamObserver<AccountsResponse> responseObserver) {
 
         logger.info("Search By Username Endpoint.");
         logger.info("");
@@ -483,8 +480,8 @@ public class AdminAccountsImpl extends AdminAccountsServiceImplBase {
     }
 
     @Override
-    public void searchByFirstname(biz.nynja.admin.account.grpc.SearchByFirstNameRequest request,
-                                  io.grpc.stub.StreamObserver<biz.nynja.admin.account.grpc.AccountsResponse> responseObserver) {
+    public void searchByFirstname(SearchByFirstNameRequest request,
+                                  StreamObserver<AccountsResponse> responseObserver) {
 
         logger.info("Search By FirstName Endpoint.");
         logger.info("");
@@ -555,8 +552,8 @@ public class AdminAccountsImpl extends AdminAccountsServiceImplBase {
     }
 
     @Override
-    public void searchByLastname(biz.nynja.admin.account.grpc.SearchByLastNameRequest request,
-                                 io.grpc.stub.StreamObserver<biz.nynja.admin.account.grpc.AccountsResponse> responseObserver) {
+    public void searchByLastname(SearchByLastNameRequest request,
+                                 StreamObserver<AccountsResponse> responseObserver) {
 
         logger.info("Search By LastName Endpoint.");
         logger.info("");
@@ -625,8 +622,8 @@ public class AdminAccountsImpl extends AdminAccountsServiceImplBase {
     }
 
     @Override
-    public void searchByPhoneNumber(biz.nynja.admin.account.grpc.SearchByPhoneNumberRequest request,
-                                    io.grpc.stub.StreamObserver<biz.nynja.admin.account.grpc.AccountsResponse> responseObserver) {
+    public void searchByPhoneNumber(SearchByPhoneNumberRequest request,
+                                    StreamObserver<AccountsResponse> responseObserver) {
 
         logger.info("Search By PhoneNumber Endpoint.");
         logger.info("");
@@ -694,8 +691,8 @@ public class AdminAccountsImpl extends AdminAccountsServiceImplBase {
     }
 
     @Override
-    public void searchByEmail(biz.nynja.admin.account.grpc.SearchByEmailRequest request,
-                              io.grpc.stub.StreamObserver<biz.nynja.admin.account.grpc.AccountsResponse> responseObserver) {
+    public void searchByEmail(SearchByEmailRequest request,
+                              StreamObserver<AccountsResponse> responseObserver) {
 
         logger.info("Search By Email Endpoint.");
         logger.info("");