diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/data/MifosEntityAccessData.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/data/MifosEntityAccessData.java
index 0f88d4774..884f365dd 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/data/MifosEntityAccessData.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/data/MifosEntityAccessData.java
@@ -1,3 +1,8 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.mifosplatform.infrastructure.entityaccess.data;
 
 import org.mifosplatform.infrastructure.entityaccess.domain.MifosEntity;
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/domain/MifosEntity.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/domain/MifosEntity.java
index 4d1ca0911..c30c5d74e 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/domain/MifosEntity.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/domain/MifosEntity.java
@@ -1,3 +1,8 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.mifosplatform.infrastructure.entityaccess.domain;
 
 public class MifosEntity {
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/domain/MifosEntityAccessType.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/domain/MifosEntityAccessType.java
index ae8aef5dd..a304b70a2 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/domain/MifosEntityAccessType.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/domain/MifosEntityAccessType.java
@@ -1,3 +1,8 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.mifosplatform.infrastructure.entityaccess.domain;
 
 public class MifosEntityAccessType {
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/domain/MifosEntityType.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/domain/MifosEntityType.java
index 092cbc716..bd49622f7 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/domain/MifosEntityType.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/domain/MifosEntityType.java
@@ -1,3 +1,8 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.mifosplatform.infrastructure.entityaccess.domain;
 
 public class MifosEntityType {
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/exception/MifosEntityAccessConfigurationException.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/exception/MifosEntityAccessConfigurationException.java
index 5cda70459..01c9bc31b 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/exception/MifosEntityAccessConfigurationException.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/exception/MifosEntityAccessConfigurationException.java
@@ -1,3 +1,8 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.mifosplatform.infrastructure.entityaccess.exception;
 
 import org.mifosplatform.infrastructure.core.exception.AbstractPlatformDomainRuleException;
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/service/MifosEntityAccessReadService.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/service/MifosEntityAccessReadService.java
index c1429c439..13b25cbfc 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/service/MifosEntityAccessReadService.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/service/MifosEntityAccessReadService.java
@@ -1,11 +1,16 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.mifosplatform.infrastructure.entityaccess.service;
 
-import java.util.Collection;
-
 import org.mifosplatform.infrastructure.entityaccess.data.MifosEntityAccessData;
 import org.mifosplatform.infrastructure.entityaccess.domain.MifosEntityAccessType;
 import org.mifosplatform.infrastructure.entityaccess.domain.MifosEntityType;
 
+import java.util.Collection;
+
 
 public interface MifosEntityAccessReadService {
 	Collection<MifosEntityAccessData> retrieveEntityAccessFor (Long entityId, MifosEntityType type, 
diff --git a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/service/MifosEntityAccessReadServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/service/MifosEntityAccessReadServiceImpl.java
index 35d78749a..f49ce9be4 100644
--- a/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/service/MifosEntityAccessReadServiceImpl.java
+++ b/mifosng-provider/src/main/java/org/mifosplatform/infrastructure/entityaccess/service/MifosEntityAccessReadServiceImpl.java
@@ -1,13 +1,10 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 package org.mifosplatform.infrastructure.entityaccess.service;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collection;
-
-import javax.sql.DataSource;
-
-import org.joda.time.LocalDate;
-import org.mifosplatform.infrastructure.core.domain.JdbcSupport;
 import org.mifosplatform.infrastructure.core.service.RoutingDataSource;
 import org.mifosplatform.infrastructure.dataqueries.service.GenericDataServiceImpl;
 import org.mifosplatform.infrastructure.entityaccess.MifosEntityAccessConstants;
@@ -17,7 +14,6 @@ import org.mifosplatform.infrastructure.entityaccess.domain.MifosEntityAccessTyp
 import org.mifosplatform.infrastructure.entityaccess.domain.MifosEntityType;
 import org.mifosplatform.infrastructure.entityaccess.exception.MifosEntityAccessConfigurationException;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
-import org.mifosplatform.organisation.office.data.OfficeData;
 import org.mifosplatform.useradministration.domain.AppUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,6 +22,10 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
+
 @Service
 public class MifosEntityAccessReadServiceImpl implements MifosEntityAccessReadService {