diff --git a/README.md b/README.md
index 7a47623..02c931c 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,10 @@ The following steps configure a sample P2P for Hazelcast Session Replication.
 
 Optionally, you can add a `configLocation` attribute into the `<Listener>` element. If not provided, `hazelcast.xml` in the classpath is used by default. URL or full filesystem path as a `configLocation` value is supported.
 
+***Classloader for Hazelcast Instance***
+
+Hazelcast instance sets and uses context classloader (`WebAppClassLoader`) whilst the initialization. However, Hazelcast's classloader configuration cannot be changed dynamically after the instance startup. Thus, if the context's classloader changes during the application runtime, it won't be reflected to the Hazelcast instance.  
+
 ## Deploying Client-Server for Tomcat
 
 In this deployment type, Tomcat instances work as clients on an existing Hazelcast Cluster.
@@ -165,7 +169,7 @@ An example client config that connects directly (i.e. doesn't use multicast) to
 - Add `sticky` attribute into `<Manager>` element. Its default value is *true*.
 - Add `processExpiresFrequency` attribute into `<Manager>` element. It specifies the frequency of session validity check, in seconds. Its default value is *6* and the minimum value that you can set is *1*.
 - Add `deferredWrite` attribute into `<Manager>` element. Its default value is *true*.
-- In P2P mode, add `hazelcastInstanceName` attribute into `<Manager>` element. It specifies an existing Hazelcast instance to use for session replication.
+- In P2P mode, add `hazelcastInstanceName` attribute into `<Manager>` element. It specifies an existing Hazelcast instance to use for session replication. The same can be achieved by setting `instanceName` property in Hazelcast configuration. If no instance name is configured, Hazelcast instance starts with a default instance name (`SessionManager.DEFAULT_INSTANCE_NAME`).
 
 <br></br>
 
diff --git a/checkstyle/ClassHeader.txt b/checkstyle/ClassHeader.txt
index 082ca8e..a68d856 100755
--- a/checkstyle/ClassHeader.txt
+++ b/checkstyle/ClassHeader.txt
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
diff --git a/pom.xml b/pom.xml
index 35d5f13..f0479be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+  ~ Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/tomcat-core/src/main/java/com/hazelcast/session/ClientServerLifecycleListener.java b/tomcat-core/src/main/java/com/hazelcast/session/ClientServerLifecycleListener.java
index b4b7ee3..4515333 100644
--- a/tomcat-core/src/main/java/com/hazelcast/session/ClientServerLifecycleListener.java
+++ b/tomcat-core/src/main/java/com/hazelcast/session/ClientServerLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 package com.hazelcast.session;
diff --git a/tomcat-core/src/main/java/com/hazelcast/session/HazelcastInstanceFactory.java b/tomcat-core/src/main/java/com/hazelcast/session/HazelcastInstanceFactory.java
index 3fb891a..070d6f9 100644
--- a/tomcat-core/src/main/java/com/hazelcast/session/HazelcastInstanceFactory.java
+++ b/tomcat-core/src/main/java/com/hazelcast/session/HazelcastInstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 package com.hazelcast.session;
diff --git a/tomcat-core/src/main/java/com/hazelcast/session/HazelcastSession.java b/tomcat-core/src/main/java/com/hazelcast/session/HazelcastSession.java
index c0c2d8e..c7d0323 100644
--- a/tomcat-core/src/main/java/com/hazelcast/session/HazelcastSession.java
+++ b/tomcat-core/src/main/java/com/hazelcast/session/HazelcastSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 package com.hazelcast.session;
diff --git a/tomcat-core/src/main/java/com/hazelcast/session/HazelcastSessionChangeValve.java b/tomcat-core/src/main/java/com/hazelcast/session/HazelcastSessionChangeValve.java
index bfbe7bb..4b2f12c 100644
--- a/tomcat-core/src/main/java/com/hazelcast/session/HazelcastSessionChangeValve.java
+++ b/tomcat-core/src/main/java/com/hazelcast/session/HazelcastSessionChangeValve.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 package com.hazelcast.session;
diff --git a/tomcat-core/src/main/java/com/hazelcast/session/HazelcastSessionCommitValve.java b/tomcat-core/src/main/java/com/hazelcast/session/HazelcastSessionCommitValve.java
index 2055248..7ed48a9 100644
--- a/tomcat-core/src/main/java/com/hazelcast/session/HazelcastSessionCommitValve.java
+++ b/tomcat-core/src/main/java/com/hazelcast/session/HazelcastSessionCommitValve.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 package com.hazelcast.session;
diff --git a/tomcat-core/src/main/java/com/hazelcast/session/P2PLifecycleListener.java b/tomcat-core/src/main/java/com/hazelcast/session/P2PLifecycleListener.java
index 8253955..313fa8b 100644
--- a/tomcat-core/src/main/java/com/hazelcast/session/P2PLifecycleListener.java
+++ b/tomcat-core/src/main/java/com/hazelcast/session/P2PLifecycleListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 package com.hazelcast.session;
diff --git a/tomcat-core/src/main/java/com/hazelcast/session/SessionManager.java b/tomcat-core/src/main/java/com/hazelcast/session/SessionManager.java
index 8ef6b77..192d271 100644
--- a/tomcat-core/src/main/java/com/hazelcast/session/SessionManager.java
+++ b/tomcat-core/src/main/java/com/hazelcast/session/SessionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 package com.hazelcast.session;
diff --git a/tomcat-core/src/main/java/com/hazelcast/session/package-info.java b/tomcat-core/src/main/java/com/hazelcast/session/package-info.java
index 834dbff..8475f49 100644
--- a/tomcat-core/src/main/java/com/hazelcast/session/package-info.java
+++ b/tomcat-core/src/main/java/com/hazelcast/session/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 /**
diff --git a/tomcat-core/src/test/resources/hazelcast-1.xml b/tomcat-core/src/test/resources/hazelcast-1.xml
index d811d00..a06e84e 100644
--- a/tomcat-core/src/test/resources/hazelcast-1.xml
+++ b/tomcat-core/src/test/resources/hazelcast-1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+  ~ Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/tomcat-core/src/test/resources/hazelcast-2.xml b/tomcat-core/src/test/resources/hazelcast-2.xml
index 06f8b8c..46ec543 100644
--- a/tomcat-core/src/test/resources/hazelcast-2.xml
+++ b/tomcat-core/src/test/resources/hazelcast-2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+  ~ Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/tomcat-core/src/test/resources/hazelcast.xml b/tomcat-core/src/test/resources/hazelcast.xml
index 065a7dc..57afc42 100644
--- a/tomcat-core/src/test/resources/hazelcast.xml
+++ b/tomcat-core/src/test/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+  ~ Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/tomcat6/src/main/java/com/hazelcast/session/HazelcastSessionManager.java b/tomcat6/src/main/java/com/hazelcast/session/HazelcastSessionManager.java
index 842e4e1..ff8086d 100644
--- a/tomcat6/src/main/java/com/hazelcast/session/HazelcastSessionManager.java
+++ b/tomcat6/src/main/java/com/hazelcast/session/HazelcastSessionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 package com.hazelcast.session;
diff --git a/tomcat6/src/main/java/com/hazelcast/session/package-info.java b/tomcat6/src/main/java/com/hazelcast/session/package-info.java
index 5f9db2e..c186ddb 100644
--- a/tomcat6/src/main/java/com/hazelcast/session/package-info.java
+++ b/tomcat6/src/main/java/com/hazelcast/session/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 /**
diff --git a/tomcat7/src/main/java/com/hazelcast/session/HazelcastSessionManager.java b/tomcat7/src/main/java/com/hazelcast/session/HazelcastSessionManager.java
index ccb05d4..10c32af 100644
--- a/tomcat7/src/main/java/com/hazelcast/session/HazelcastSessionManager.java
+++ b/tomcat7/src/main/java/com/hazelcast/session/HazelcastSessionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 package com.hazelcast.session;
diff --git a/tomcat7/src/main/java/com/hazelcast/session/package-info.java b/tomcat7/src/main/java/com/hazelcast/session/package-info.java
index 35159f4..e9e031d 100644
--- a/tomcat7/src/main/java/com/hazelcast/session/package-info.java
+++ b/tomcat7/src/main/java/com/hazelcast/session/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 /**
diff --git a/tomcat8/src/main/java/com/hazelcast/session/HazelcastSessionManager.java b/tomcat8/src/main/java/com/hazelcast/session/HazelcastSessionManager.java
index 9d413a1..531298c 100644
--- a/tomcat8/src/main/java/com/hazelcast/session/HazelcastSessionManager.java
+++ b/tomcat8/src/main/java/com/hazelcast/session/HazelcastSessionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 package com.hazelcast.session;
diff --git a/tomcat8/src/main/java/com/hazelcast/session/package-info.java b/tomcat8/src/main/java/com/hazelcast/session/package-info.java
index af7106f..0810a6b 100644
--- a/tomcat8/src/main/java/com/hazelcast/session/package-info.java
+++ b/tomcat8/src/main/java/com/hazelcast/session/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 /**
diff --git a/tomcat85/src/main/java/com/hazelcast/session/HazelcastSessionManager.java b/tomcat85/src/main/java/com/hazelcast/session/HazelcastSessionManager.java
index 8f454b0..87a1a20 100644
--- a/tomcat85/src/main/java/com/hazelcast/session/HazelcastSessionManager.java
+++ b/tomcat85/src/main/java/com/hazelcast/session/HazelcastSessionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 package com.hazelcast.session;
diff --git a/tomcat85/src/main/java/com/hazelcast/session/package-info.java b/tomcat85/src/main/java/com/hazelcast/session/package-info.java
index 3fa3a63..a6f0fc3 100644
--- a/tomcat85/src/main/java/com/hazelcast/session/package-info.java
+++ b/tomcat85/src/main/java/com/hazelcast/session/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2016, Hazelcast, Inc. All Rights Reserved.
+ * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
  */
 
 /**